Remove useless line
Remove silly test setup stuff
Fix tests