Removed boolean returns, prevented NPE by swapping stuff
Switched to Hamcrest matchers