WIP added tests