Tests are taking shape..