Added simple test and removed one import