Created initial round of tests and methods (working)