Add more tests to simple-test target