Simplification enabled by simplify and nitpicking branches.
Fix layout in landscape.
Change junit.framework.Assert and junit.framework.TestCase references to org.junit.Assert.

Fixes #106.
Use assertThat instead of assertTrue/False/instanceof and some other assertion changes
Go one step further with Matchers from the hamcrest-library
Review: change .size() usages to hasSize(), remove is() wrappers