Added the so far failing tests (API needs to change)