Added more tests. AH-294

Added more tests. Step 3 is now complete. Only step 4 remains.