Added tests
Remove unused parameter to MAKE-ID
Initial implementation of GUARD for error handling