Recfactored tests and removed unwanted upstrem artifacts