Fixed test layout...time to add some tests...