test cleanup
implement summer '14 compile fix in atom branch