Added tests for various entity classes