Added tests

WIP, will write more soon when I have more time..