added some proper tests!