Base fix for working

I have fixed the tests and referee.