Reconfigured test suite so I don't have any more excuses