Fix Tests, remove Todos