Added a couple basic tests
Cleaned up some unused parameters and used single line maps to simplify some functions