added more tests, some thoughts