fixed failed tests
added credits for Maxim