Solutions to ORF and RSTR; Test reorganisation; Some refactoring;