Fixing the tests. Tests should be better more generic.