added new class functionality and updated tests