Added functions for creating version annotations, more tests