Add test skeleton
Fix bug depending on scope to be isolated