Configuration class change to singleton
with Configuration class change to singleton, fix the spec