All code from original test dir.