Add supporting files and related tests