WIP - FIxed tests to use valid syntax. Working on initialization