Remove load testing, add extended tests