Adding tests (WIP)