Feature/milestone tests

Opening for tracking purposes.