Extended tests/removed unused code