rewrite marshal test, start to move away from GoConvey, fixes