Added an updated working set of intern unit tests, updated code to find the parent view and cleaned up code calling activate and deactviate.