restructure and hey! tests!