Minor test suite changes and starting of nt/staymen contract card