adjust Makefile test to gem structure
adjust spec to new naming and calling
re-arrange Makefile for gem structure