Adding updated test cases and integrated guard support.
Massive test cases cleanup and rewrite.