fix & cleanup tests