Cleaned testcode