added unit testing and fixed some erroneous settings
final fix for feature today