more unit testing and a bit of changes to fuzzer