Added spark and guard to automate testing