client side test does not work. Also general cleanup