adding more tests, more still needed though