cleaned up some tests & added dummy valueMapper