Tests cleaned up