cleaned up testcases file structure
added supposedly unused keywords to pass the step1 testcases
removed old test file