Removed the test for now and added static import