Added Guardian test case. Cleanup.