Add Unit Test and 3 methods