Testies & refactor