refactor

now everything runs in perfect order :)
(+ fixed a minitest bug)

@splattael