started to implement support for multiple reference types. easyb test testing
resolved conflict and tried to solve easyb problem
resolved minor conflicts in easyb-test