Wrote a few tests for reception, and cleaned a bit up in organization tests.