Tests fixes and removed unnecesary methods