Updated Passive view pattern and added unit tests