restructured some tests