Removed leftover tests :-P