Added test and assertions