Fix most tests
Need to remove these to make it work. Probably not ideal