Added tests from discussion board