Typos and missing package stmt
Move stupid 'main' method out to be a JUnit test