Add new thrown exception to getCurrentLocation test
Include styles.js in js tests
Merge branch 'master' into bugfixes