added a lot of sonar testing + uncle sam