Added tests, updated entities...