Remove legacy commands
Add test rule to Makefile