added test for context binding
added more tests, cleaned up issue in base-model