something fixed, tests improved