EAGLESIX-2892 moved old unit tests, fixed formatting