added more test cases and fixed imports