Added test views for my cues. Code clean up performed.