More tests, still need to be converted to a proper test framework however