fix return-value
more tests