snappy and fixing up tests