Just some tests added to main... mainly