Removed file that wasn't used.
Fixed tests. Naive me, thought I won't break 'em! :)