Adding test and more structure.