Initial Import

Add some tests