#195 rest test fails fixes