Cleaned up tests and simplified how tests are run/included