hotfixes + Tests