Started tests. Cleaned up some layouts.