Fixed false negatives and moved data input values to the properties
file.