Clean-up testing suite and add testling config