Adding in a few unit tests, now I need to implement them