Moved source, removed test