Modified per unit testing