Partially clean up the test benches, the build system for them needs to be improved however and there should be more test cases.