Added test coverage / minor edits / Removed package-info.java (not
necessary at this time)