Updated import locations for test files
Updated expected test result