In Progress: creating test interfaces, other small edits