Cleaned up runtests