Adding visibility tests per Alan's review feedback