added tests from alternate branch