Refactored tests and removed uneeded extensions