Added more general tests