Updated toolkit tests

See title