Added new tests to implement; changed help