WIP clearly, start writing tests

Fixed