Committed lost files in previous commit. Modified tests.