fixing caching issues
removing old test