Deleted the solve two, replaced with general, added tests