Added and updated code + tests from old code base of DataSource/MysqlDataSources (WIP)