Temporary workaround for before_run
Add initial test