fixes/testing