Add internal tests - more to do