Added tests for 0.4

Change-Id: If8560076c1fea926cdff90fa6b147057d3ad1a76