Restructures tests

Signed-off-by: Christopher Rogers <chrissrogers@gmail.com>