Feature/rtd_tests

Work in progress. RTD tests currently broken