Moved test out of serve