review/topexp unittest

This branch fixes an important regression.