Fix tests. Remove outdated tests