Cleaned up listener
User entity in with test