Fixing existing tests, implemented results