This commit also makes the following changes (unit tests): * Add/remove/rename/rewrite test functions.