WIP adding tests