Refaccctooorinnnggggg
Extended test suite