Reorganized, started more complex entity test
working more on entity test, fix assertion for players
adding entity test modifications