added tests to avoid commits that do not work like before. DO NOT PULL ANY COMMIT BEFORE THIS