removed ValueCreator and mode functions
moved test file