added more tests, tweaked output