correct 3 tests and temporarily removed outdated tests from test scope, this tests need an update with the new data handlers
