Added tests (Krista, Joanne, Gene)