restructuring
more restructuring
added tests for new receiver methods
putting tests in order and renaming contexts