Working for test, more tweaking to go for others.