B-55821 Added structure for tests
B-55821 Added rudimentary tests
B-55821 Updated tests