updating entities and fixing integration tests