Added unit and acceptance tests for Hoai Troung and Akos Furton