Removing long "if" conditions
Updating tests to match Moshomo's factorization
Fixing a bug in "update" function
Beginning work on UpdateTest test