Simplified the unit testing procedure a bit