small changes to test and src code