Added Tests back in

Will relocate later to stop warnings