Added some test cases and basic test structure