Updated test & code style