First test added, small bugs fixed