Added Fixes and Tests for Creation