moved a bunch of test stuff around so that the js files mirror the src