Kill some tests fixes #3