Fixed things
Test implemented