fix issue 24:
	- fix base model
	- added test case