Added 2.00 test case and some refactoring code