Fix implemented tests and add more failing