Testing/fixes/cleanup