Tests added

Yes, I know, but I didn't want to scatter the test with too many files, I'm leaving it there, but if you think it's necessary, i can move it