Finished database entities and removed test