fixed some naming and source tests are mostly in an initial state, untested