Continued work on unit and javascript testing