Adding new tests in and old tests back to try again...