More test refactoring
Added better get tests
More testing generalization
More testing genirifcation