Unit/Acceptance tests from Jesse Vo jv23358