Added more unit tests

Almost finished with client side code tests!