Add missing constructor and cleanup tests