Changed import paths and uncommented tests