Switched over to MinUnit for unit testing