Add exercises, further tests