Now, only Context's have a property map. A number of classes has to change to reflect this change.

- first-step to using JUnit 4.