Updates the tests so that they check new features

Also removes an old file that has been replaced by previous commit
Also updates previously failing test