Added a few more tests and prepared for next steps.