Simplified the unit test spec files slightly