fixes, first test