Removed author tags, organized since tags, javadocs and added more tests