Move tests. Modify tests for new functions.
Modify all function calls to explicitly state each variable.