Final clean up.
Final cleanup. Use defIt everywhere.
Final cleanup. Use more descriptive TODOs.
Final cleanup. Made unit test parameters configurable via config file.