added first round of pending tests
first integration test
added dev bootcamp example marker js logic
fix conflicts