Adds/modify some tests.