Added a few new tests and updated a few small bugs