work on tests and apics fine tuning