Aes/entity tests

I like it, it makes a lot of sense for now.

Let me try my hand at reworking these a bit and I'll let you know how it comes. Thanks David!