Added tests for base file
Updated scaffold to fix