Work in progress on refactored tests