Make bump build number also return the build number
Add attire key rewriting
Added test sanity and fixed the test-runner