Now with passing (albeit, not very exciting...) tests.