Add some tests, still non-functional