Added more spec tests