added tests, import work, cleanup of js naming stuff