modifications for working unit testing!