Clean up needless includes
Implement test infrastructure