TST: fleshed out implementation and now more tests correctly fail