Some bug fixes, additional test file, starting of cylical support