WIP adding some tests