Fix Makefile - thanks to Hendrik Muller
Move test code to a test directory
Remove type specs from test code, only needed in implementation