More cleanup and adding unit tests.
Added more testing.
Refactored the build to differentiate between normal and integration tests using the junit categories. Removed the special integration property requirement.