yep, have another commit that fixes and adds tests.