Use subtest for clarity

Still not sure why the last test fails, and why the todo is not working