Fixed Factory, Removed JDBC Tests, Modefied Entities