Fixed a few simple the error.
Added helper that can be done easily in the Eclipse JUnit test.