WIP added some tests