minor changes
even more tests