Continue adding tests