few tests, minor fix