added more tests, v 1.0