Renamed, cleaned up interlocked.hpp; added test