#157 Test fixes