Fixed testing of buddy
Added in better testing and added alignment