added int to possible default values, enhanced test scenarios