Got fecking dependency injection working! Feckin w00t!
Added test (and non-test) macros into makefile