Refactored Guard files on testapp