Removed jquery dependency, added tests