more tests + starred fixes