Fixing broken spec and updating imports