work in progress, more tests