++ adds tests, adds neutron waiting, minor refactor

Change-Id: I6a4fa3a65c5a856223f0bc9720c430e72f0698f9