Adding tests, WIP