Move unit tests to be in the same package as the classes they are testing

Change-Id: I785d70753dd9e02083ac32ed78ecba5515aa9f71
3 files changed