refactored, removed extraneous tests