Changes to test (no incompl. Keil impl.)