Add and cleanup tests