Better tests, better layouts