Updates to query-api for code coverage and removing unused constructors.  Refactored a few classes to become immutable, since that's how they were used.