Expand test suite. Still have bugs to fix.