All tests completed. Needed optimisation for it and to fix client side