Updated Unit Testing and Stuff.