DB, Controller and Unittesting added