UPDATE: New unit test skeletons