Adding hammer-tests