Finalizing dev testing