Add test rake task and refactor layout.