Rearranged tests
Added license and copyright information