(WIP) Merged more tests. They don't pass right now!