Ease debuging
Added support for Embed definition
Added more tests
Fixed consistancy