more tests, more fixed bugs