Revised some unnecessary tests.
All current tests passing.