Merging changes in FormLoader's test/java folder