move exports to the end
move error message tests to common tests
add contains check
cleaning up build file