expanded tests and fixed prereqs