Adds tests, guard