Updated size count and added tests