added more tests, looks promising