#31: fix test and beautify