move test support to the correct classpath
add in files that were removed in the last commit. gitweirdness
closes #34