update tests + cleanup structure