Fixes bug on record-base extension
Adds more test coverage