Fix up .merlin

Signed-off-by: John Else <john.else@citrix.com>
Add skeleton unit test to build

Signed-off-by: John Else <john.else@citrix.com>