Client side testing
Update unit tests
Remove unused variable
Add a few more unit tests