Feature/rtd tests

Work in progress. RTD tests currently broken