Add some necessary includes
Add a 'test' build target for testing