Revert "fix tests and move tests in to test/"

This reverts commit 056b11c03b8ce5fb308541da75ec437e8cf6bc23.
Revert "fix"

This reverts commit 7d4daef82a22738e630162fd2ef6a518de2c3b9f.