RF: more constants
RF move tests into separate dir/file