Fixed namespacing bug in activation.hpp + better naming and added more tests