(#18) Cleanup, spec-tests for visibility handler