Reduced unittest size and moved to correct place.