Cleaned up tests, small layout fixes