Continued improving tests and fixing bugs.