Renamed spec, fixed bugs with kill