Started some tests for adding observers.
Code cleanup.
First test case for adding observers.