js all working, tests all passing