Added some tests and jquery toggling of labels