fixed zeus test
updated test_guard
fixed possible NPE; cleanup