Changes for testing in KTH