attempt
karma locked and loaded.
merge master
entity tests