Added unit & acceptance tests for Michelle Mandel