Unit tests for BTM and VU fixed