rebuilt tests to be more opaque