Fixes broken tests, removes old tests