Adding unit tests for new 1.2 code