Add more self tests