Avoid collision with superclass attribute
Split out some functionality to utils.cpp
Update catchhpp testing framework