Removing unused imports and removing TODO/@Ignore for test which now passes