* code formatting
* extend core tests