Updated tests
Fixed creation bug