Rewrote some of the tests for both modules