Code works for basic unit_tests; need to add more