Tests and bugfixes
creating entity - but test isn't passing yet