Corrected failing tests

and noted tests which fail correctly (current implementation is lacking)