Adding more tests and javascript