Adding unit and acceptance tests for Matt Couture