oops: Fix lints tests and variable replacement