Rename files acc to convention, fix tests