Tests, bug fixes
asbEntity tests and changes