Cleaned up old test suite