Tests fixed; caching