Cleaned up acceptance tests

A lot of the tests were testing things that really should be tested via
unit tests, so those were deleted and unit tests will be revamped to
make sure they are covering everything they need to be covering.
Cleaned up unit tests.
Merge pull request #339 from mhaskel/test_overhaul

Test overhaul