Moved test files to package
Improved testing structure.

1. Pulled test data into resources directory

2. Refactored tests to use JUnit Assert rather than Java assert

3. Improved robustness of integration test