Added tests back in only commented per @jenny request - serve as reminder to update them