Added a little more to add and uncommented the tests in main