Improvement/zbeacon tests

This patch relies on #212 (can only be merged after it)