added additional models and specs, devise issues fixed