Added test-utils; js reindentation