Added new test code