some refactoring, changed naming to be more consistent
unit tests for QuBit