Better tests and guardfile