Added test cases Josi + Martin.