fixed default value loading logic
updated tests