Added test and renamed things