Moved tests up one level