WIP. Trying to write proper tests