Code

Fix for last commit - I accidentaly broke my local Makefile and tests weren't being...