Added some tests and improved layout.